Support for projectName and improve namespace