Fixed: Missing prefixes (autoloader)
(cherry picked from commit 616d839)
(cherry picked from commit 9c98bb9)