Fix PHPCS issue and uppercase all the U's in setup to be consistent