Consolidated naming and fixed reflection findClass