Simplified several procedure names.