more naming convention updates