Improvements to source naming conventions