bring naming in line with Ruby conventions