Renaming for clarity.
Updating compiling options.