Revert "Refactored shading of package names to format(Properties,String)"

This reverts commit 675c485f2306750a29455156379b25fdf2ba1d1c.