Started renaming of Symfony files