Fixed regex for element names