Update accessor method names following hint from Gerd