changed default kind naming to use . rather than __ as a separator