Refactored Core prefix to Wpf