Naming and bug fixes.