Few more extension code cleanups
Changed some strings for consistency