Unifying method naming

Related to #41