Change some strings
Merge commit '0889c1b0af2ea5fbd9d608c0192d1cd3a1bd53a5' into static_library