Modified variable name to respect fw4spl convention and move macro definitions
Remove an other standalone support