[functions] some more renaming
[functions.expression.base] remove unnecessary whitespace