Remove this name here and other places