Changing method names to better indicate their intent, part of #55