Some renaming/cleanup