WIP: Refactor constants (comments welcome)

So I will replace Element with XrfElement in my code.