rename constant -> literal in more places