Minor renaming
Updated validation rules to use Schema.org-native modelling