* unifying names
fixing naming convetions. Issue #382