Updating naming convention + other minor changes.