Several functions inside system module are renamed.