cleaning up meta names and avoiding direct  usage