fixed some naming and compile issue