Fix for "Improper name"