and fix the naming