Naming adjustments

For issue #338.