Updated for better jar naming