completed renaming, ready for development