Fix up naming.