Move to constants for type / reveal method names

Work on liquid merging