Updating files with new names and adding some new code.