Some renames and cleanup