Eliminate export and simplify names.