Updating naming convention