Strong naming and minor updates