Changed naming convention as per #127