Merge naming-tool/master