I think it makes sense to remove the db part from the create SP and Function templates. Generally we work with two database and they are named differently in the development and in production use.
Now if I create a SP gnosis2 in my test, it will fail in my production server as its gnosis up there. Anyway, the SP is specific to the DB it is created in. Removing the DB name will make migration more portable.