Updated primitive method names
Re-added missing classes

Git?