ids for whalesong in the correct env, and rename builtins in tests

closes #152