Bug 155: fixed unintended code renaming