Cleanup, moving to more clear naming convention