Removed references to AbstractProject, keep only full name instead