The correct "general" definition also requires the prime element to be non-invertible and non-zero, thus 1 is excluded.

It should be noted that this definition excludes "composite numbers" only when the ring is an integral domain. In a general commutative ring this isn't necessarily true.