More consistent nameing.

Use directory name also used in module for logger.