renaming to match web system and cleanup