Make naming scheme coherent with github