Fixed some method names
XMerge branch 'master' of https://github.com/StockGround/freezing-octo-adventure