CurrentItem columns

Hi,

At the Library level we have defined columns.   When we add the document the columns are populated via a form.  In the reusale workflow I created, I expected the "CurrentItem" dropdown to list all these column.  However, they are only available under LibraryName:column.   This defeats the purpose of making this a template to be shared accross multiple librarys if I have the name embedded in the code. 

How do I get these column on the "CurrentItem"?

Thanks.

Tom