Some standard development, renaming classes