~ adapted naming to new convention