cleaned up repo

with new names