Minor variable name changes to please the PHPCS overlords
Depend on Illuminate's string class instead of hard-coded Str class