naming: fixed hardcoded substr [closes #58]