Fixed two method naming bugs