Variable name cleanup

Cleaned up variable names to perpare for client manfiest creation.