Rename hidden methods and straighten out ternary