updating naming conventions