[Core] Renamed some variables