name changes and coding updates/changes