Added some properties to name maps
More updates to name maps for tags