Various renaming, preparing manual OGL 3