Changes to naming scheme