renaming for consistency and removal of namespace within code (since AMD and require support caused a nice rearranging)