Removed x from component names, fixing (#45)