More renaming and added metadata assertion extension