Changed some function aliases.