Use better names for linking constants