updates to fix a naming convention