[Issue #91] rename stuff