remade mapping/naming for administration