Simplify dist handling
Improve naming