@craigspaeth: Consistent naming