Fix project name
Remove architecture violation discovered in splitting