refactored the method/field names

due to a crash, I had to... also it looks tidier that way~