Some functions renamed