Updating naming conventions.