Small fix to always get whitespace between class names

Change-Id: Ibe4742bfb4e04298d205abe7758a7059a43b5cd2