naming and lacing fixes