Clean up convention.
Update more build system.