more consistent naming. Also fixed ECS bug.