Remove white space
Rename API interfaces.