It often seems like this, but it also seems like the term rūpa both is used both ways? You had a thread about this Must we read rūpa as "body"? . Did you reach any firm conclusions?
See terminology - What is the difference between an element and an atom? - Chemistry Stack Exchange