Feature/naming review