Merge "Rename nano prot classes to avoid conflict" into main