expr: make Expr creation naming and file location consistent Signed-off-by: Ran Benita <ran234@gmail.com>