Simplify and fix repo labels