Standarize method name.
Merged changes