Variable Name Fixes and namespace move