[#9] changed method names to follow convention