remove x- from component names