make naming more specific

This is the naming change extracted from pull #10