Renaming some more and Fixed MetaData Test