~ adapted naming to new conventions