Fix some naming and some references