Fix minor issue
Adjust english names