Name is now in convention

Now the code is in convention, no errors, incarnation code deleted