renames and arguments fix