Fixed name length > 15 support