Finished up final renames inside of tests