Adjusting some stuff for the new name