Revert "LPS-33545 Julio said we can go with the format xyz-abc"

This reverts commit b9e09385bc590e4d75639712dbbbe118c7855276.