rename important things
improve compatibility