renamed all objects to be Tag<name> for consistancy