Fix EZP-23805: Cleaned up vendor prefixes
Minor CS fixes