renamed tags for better consistency