Update code to reflect latest ember conventions