Merge "Fix build due to stubs errors on filename changes"