Improve naming and fix brainfart due to bad naming before