more sane naming