changes to avoid future name conflicts

variable names are always words whereas functions and macros are never words