started work on renaming some forgotten embedded attributes