Fix to spec

This change deletes and renames elements following final current model spec