Improve path naming convention consistency.