refactor (just renames) and cleanup