quickfix + some renaming