Correct opaqueness of types and variable names