Made all commands use extract_name for consistency. #100