Finished updating naming conventions stuff