Rename fields and remove second level metapush