Updated file names to support uFrame integration testing
Merge "Updated file names to support uFrame integration testing"