Revert "Revert "Fixed mislabeled fully qualified class paths""

This reverts commit da74c871d3087a9131de8eb9a77e74a1f16f6dca.