Fixed bug where variables and functions could share name