Force move of generated files.
Fix constant parsing.
Use the same identifier.