bring naming into alignment