Name changes on constants and adjusted Thower class