Initial commit
Remove old name stuff