updating naming convensions