some naming problem fixed