Updating tidy-up-core to jodal specs and changing one name. Still need to update docs
Merge branch 'tidy-up-core' into metadata-provider