refactored to bring naming into line with other projects