Refactor to make more standard methods names