Moving to more generic internal naming.
0.4.0
0.4.1