Renamed some definitions