Updating naming convention to theta standards